From: Anja Bruls Date: Wed, 5 Dec 2018 15:28:09 +0000 (+0100) Subject: fixed merging X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~7^2~8^2^2~1 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=98f6fa068291930879284f0699d4c8d9c41d9d25;p=siridb-server.git fixed merging --- diff --git a/dbtest/.accounts.dat b/dbtest/.accounts.dat deleted file mode 100644 index dcb4dd45..00000000 --- a/dbtest/.accounts.dat +++ /dev/null @@ -1 +0,0 @@ -üï‚sa¿EI5djmJS$1DhOYRlSPpQ7LKlNlnT.npvRhg8uQPlWkoQRNhKPXnNknMtrRuKUTR \ No newline at end of file diff --git a/dbtest/dbpath0/.accounts.dat b/dbtest/dbpath0/.accounts.dat deleted file mode 100644 index 2eb141db..00000000 --- a/dbtest/dbpath0/.accounts.dat +++ /dev/null @@ -1 +0,0 @@ -üï‚sa¿4xt4e1rb$1HuVsdC7ZpFcCbsI1.Vmo7hBGsbsYFFbmV/7dcHKvQJlHzw1VQ8uoG \ No newline at end of file diff --git a/dbtest/dbpath0/anja/.dropped b/dbtest/dbpath0/anja/.dropped deleted file mode 100644 index e69de29b..00000000 diff --git a/dbtest/dbpath0/anja/.max_series_id b/dbtest/dbpath0/anja/.max_series_id deleted file mode 100644 index d540dfdb..00000000 Binary files a/dbtest/dbpath0/anja/.max_series_id and /dev/null differ diff --git a/dbtest/dbpath0/anja/buffer.dat b/dbtest/dbpath0/anja/buffer.dat deleted file mode 100644 index 0ab18020..00000000 Binary files a/dbtest/dbpath0/anja/buffer.dat and /dev/null differ diff --git a/dbtest/dbpath0/anja/database.conf b/dbtest/dbpath0/anja/database.conf deleted file mode 100644 index b56a91bd..00000000 --- a/dbtest/dbpath0/anja/database.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Welcome to the SiriDB configuration file -# - -[buffer] -# Alternative path to save the buffer file. -# In case you later plan to change this location you manually need to move -# the buffer file to the new location. -# path = - -# Buffer size in bytes. This size must be a multiple of 512 with a maximum -# of 1048576 bytes. Be careful using large values since SiriDB will require -# memory based on this value. A value between 1024 and 32768 is recommended. -# size = 1024 - -size = 1024 diff --git a/dbtest/dbpath0/anja/database.dat b/dbtest/dbpath0/anja/database.dat deleted file mode 100644 index 27f24b4c..00000000 Binary files a/dbtest/dbpath0/anja/database.dat and /dev/null differ diff --git a/dbtest/dbpath0/anja/groups.dat b/dbtest/dbpath0/anja/groups.dat deleted file mode 100644 index 3c82d7ae..00000000 --- a/dbtest/dbpath0/anja/groups.dat +++ /dev/null @@ -1 +0,0 @@ -ü \ No newline at end of file diff --git a/dbtest/dbpath0/anja/series.dat b/dbtest/dbpath0/anja/series.dat deleted file mode 100644 index 22057fe7..00000000 Binary files a/dbtest/dbpath0/anja/series.dat and /dev/null differ diff --git a/dbtest/dbpath0/anja/servers.dat b/dbtest/dbpath0/anja/servers.dat deleted file mode 100644 index 05c9a45c..00000000 Binary files a/dbtest/dbpath0/anja/servers.dat and /dev/null differ diff --git a/dbtest/dbpath0/anja/users.dat b/dbtest/dbpath0/anja/users.dat deleted file mode 100644 index 4ce0f39c..00000000 --- a/dbtest/dbpath0/anja/users.dat +++ /dev/null @@ -1 +0,0 @@ -üð„iris¿/ITTEIBl$1Q7urI1k4h4PCfGgCI5ifj7Iyc8wqJVdAU5h/TSinJUe5ObdeH5V0Méÿ \ No newline at end of file diff --git a/dbtest/dbpath0/benchmark/.dropped b/dbtest/dbpath0/benchmark/.dropped deleted file mode 100644 index e69de29b..00000000 diff --git a/dbtest/dbpath0/benchmark/.max_series_id b/dbtest/dbpath0/benchmark/.max_series_id deleted file mode 100644 index 01387f5b..00000000 Binary files a/dbtest/dbpath0/benchmark/.max_series_id and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/buffer.dat b/dbtest/dbpath0/benchmark/buffer.dat deleted file mode 100644 index 23db84ea..00000000 Binary files a/dbtest/dbpath0/benchmark/buffer.dat and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/database.conf b/dbtest/dbpath0/benchmark/database.conf deleted file mode 100644 index b56a91bd..00000000 --- a/dbtest/dbpath0/benchmark/database.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Welcome to the SiriDB configuration file -# - -[buffer] -# Alternative path to save the buffer file. -# In case you later plan to change this location you manually need to move -# the buffer file to the new location. -# path = - -# Buffer size in bytes. This size must be a multiple of 512 with a maximum -# of 1048576 bytes. Be careful using large values since SiriDB will require -# memory based on this value. A value between 1024 and 32768 is recommended. -# size = 1024 - -size = 1024 diff --git a/dbtest/dbpath0/benchmark/database.dat b/dbtest/dbpath0/benchmark/database.dat deleted file mode 100644 index 69d85810..00000000 Binary files a/dbtest/dbpath0/benchmark/database.dat and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/groups.dat b/dbtest/dbpath0/benchmark/groups.dat deleted file mode 100644 index 3c82d7ae..00000000 --- a/dbtest/dbpath0/benchmark/groups.dat +++ /dev/null @@ -1 +0,0 @@ -ü \ No newline at end of file diff --git a/dbtest/dbpath0/benchmark/series.dat b/dbtest/dbpath0/benchmark/series.dat deleted file mode 100644 index 6d1def40..00000000 Binary files a/dbtest/dbpath0/benchmark/series.dat and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/servers.dat b/dbtest/dbpath0/benchmark/servers.dat deleted file mode 100644 index e81f0aa8..00000000 Binary files a/dbtest/dbpath0/benchmark/servers.dat and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000000.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000000.idx deleted file mode 100644 index 3dc3071b..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000000.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000000.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000000.sdb deleted file mode 100644 index 414401a9..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000000.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000001.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000001.idx deleted file mode 100644 index 0c2f75e3..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000001.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000001.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000001.sdb deleted file mode 100644 index 99854711..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000001.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000002.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000002.idx deleted file mode 100644 index 9ae6160d..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000002.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000002.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000002.sdb deleted file mode 100644 index b6716945..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000002.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000003.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000003.idx deleted file mode 100644 index ef590439..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000003.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000003.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000003.sdb deleted file mode 100644 index f6bce1c1..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000003.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000004.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000004.idx deleted file mode 100644 index 68840942..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000004.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000004.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000004.sdb deleted file mode 100644 index 843b7ea9..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000004.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000005.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000005.idx deleted file mode 100644 index 5f36889f..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000005.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000005.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000005.sdb deleted file mode 100644 index bb1cd000..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000005.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000006.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000006.idx deleted file mode 100644 index a4af0655..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000006.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000006.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000006.sdb deleted file mode 100644 index c41c5906..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000006.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000007.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000007.idx deleted file mode 100644 index 6f92932e..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000007.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000007.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000007.sdb deleted file mode 100644 index 163f5d9d..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000007.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000008.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000008.idx deleted file mode 100644 index 4564c673..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000008.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000008.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000008.sdb deleted file mode 100644 index f0920f9b..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000008.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000009.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000009.idx deleted file mode 100644 index 46c7334d..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000009.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000009.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000009.sdb deleted file mode 100644 index ff6a2df0..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000009.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000010.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000010.idx deleted file mode 100644 index ded7b9ce..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000010.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000010.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000010.sdb deleted file mode 100644 index 43dd682d..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000010.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000011.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000011.idx deleted file mode 100644 index 91d2364b..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000011.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000011.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000011.sdb deleted file mode 100644 index 0f101995..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000011.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000012.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000012.idx deleted file mode 100644 index 9b301151..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000012.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000012.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000012.sdb deleted file mode 100644 index 78699958..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000012.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000013.idx b/dbtest/dbpath0/benchmark/shards/1451520000000000013.idx deleted file mode 100644 index cde04a77..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000013.idx and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000013.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000013.sdb deleted file mode 100644 index c9c1dcb7..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000013.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000014.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000014.sdb deleted file mode 100644 index 0ee2c0d3..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000014.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000015.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000015.sdb deleted file mode 100644 index b7e12434..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000015.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000016.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000016.sdb deleted file mode 100644 index 351ca75e..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000016.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000017.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000017.sdb deleted file mode 100644 index 09f22c51..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000017.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000018.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000018.sdb deleted file mode 100644 index 72497170..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000018.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000019.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000019.sdb deleted file mode 100644 index 49bc9d2c..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000019.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000020.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000020.sdb deleted file mode 100644 index 8123b4d8..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000020.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000021.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000021.sdb deleted file mode 100644 index bc55f159..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000021.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000022.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000022.sdb deleted file mode 100644 index 27dda82e..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000022.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000023.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000023.sdb deleted file mode 100644 index f1563da2..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000023.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000024.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000024.sdb deleted file mode 100644 index 34a28694..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000024.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000025.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000025.sdb deleted file mode 100644 index 6d8a6ffd..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000025.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000026.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000026.sdb deleted file mode 100644 index bc543fd3..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000026.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000027.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000027.sdb deleted file mode 100644 index b2275b7b..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000027.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000028.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000028.sdb deleted file mode 100644 index f2b4a55e..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000028.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000029.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000029.sdb deleted file mode 100644 index b65c2171..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000029.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000030.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000030.sdb deleted file mode 100644 index 430cc4b7..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000030.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/1451520000000000031.sdb b/dbtest/dbpath0/benchmark/shards/1451520000000000031.sdb deleted file mode 100644 index 0364bd06..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/1451520000000000031.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/shards/__1451520000000000014.sdb b/dbtest/dbpath0/benchmark/shards/__1451520000000000014.sdb deleted file mode 100644 index 01dd9294..00000000 Binary files a/dbtest/dbpath0/benchmark/shards/__1451520000000000014.sdb and /dev/null differ diff --git a/dbtest/dbpath0/benchmark/users.dat b/dbtest/dbpath0/benchmark/users.dat deleted file mode 100644 index 04d03e14..00000000 --- a/dbtest/dbpath0/benchmark/users.dat +++ /dev/null @@ -1 +0,0 @@ -üð„iris¿gre84FaJ$1iMGwWNldUGnKIJjNj7bLkNHIW6PwOJiDOITEk4XLnIE9gLeBZIuFKéÿ \ No newline at end of file diff --git a/dbtest/dbpath1/.accounts.dat b/dbtest/dbpath1/.accounts.dat deleted file mode 100644 index 3c4e4436..00000000 --- a/dbtest/dbpath1/.accounts.dat +++ /dev/null @@ -1 +0,0 @@ -üï‚sa¿vZEWv13W$172ZCeYcCY4qc9yWq4Rn.V4DecWWXIU55S/c93sBDcPzyZZ8b6teaR \ No newline at end of file diff --git a/dbtest/dbpath1/benchmark/.dropped b/dbtest/dbpath1/benchmark/.dropped deleted file mode 100644 index e69de29b..00000000 diff --git a/dbtest/dbpath1/benchmark/buffer.dat b/dbtest/dbpath1/benchmark/buffer.dat deleted file mode 100644 index f28c4699..00000000 Binary files a/dbtest/dbpath1/benchmark/buffer.dat and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/database.conf b/dbtest/dbpath1/benchmark/database.conf deleted file mode 100644 index b56a91bd..00000000 --- a/dbtest/dbpath1/benchmark/database.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# Welcome to the SiriDB configuration file -# - -[buffer] -# Alternative path to save the buffer file. -# In case you later plan to change this location you manually need to move -# the buffer file to the new location. -# path = - -# Buffer size in bytes. This size must be a multiple of 512 with a maximum -# of 1048576 bytes. Be careful using large values since SiriDB will require -# memory based on this value. A value between 1024 and 32768 is recommended. -# size = 1024 - -size = 1024 diff --git a/dbtest/dbpath1/benchmark/database.dat b/dbtest/dbpath1/benchmark/database.dat deleted file mode 100644 index 75b2fccb..00000000 Binary files a/dbtest/dbpath1/benchmark/database.dat and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/groups.dat b/dbtest/dbpath1/benchmark/groups.dat deleted file mode 100644 index 3c82d7ae..00000000 --- a/dbtest/dbpath1/benchmark/groups.dat +++ /dev/null @@ -1 +0,0 @@ -ü \ No newline at end of file diff --git a/dbtest/dbpath1/benchmark/series.dat b/dbtest/dbpath1/benchmark/series.dat deleted file mode 100644 index b1e51fa9..00000000 Binary files a/dbtest/dbpath1/benchmark/series.dat and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/servers.dat b/dbtest/dbpath1/benchmark/servers.dat deleted file mode 100644 index d6fb0469..00000000 Binary files a/dbtest/dbpath1/benchmark/servers.dat and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000000.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000000.sdb deleted file mode 100644 index cc72f877..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000000.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000001.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000001.sdb deleted file mode 100644 index 570d307a..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000001.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000002.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000002.sdb deleted file mode 100644 index 0bd7772d..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000002.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000003.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000003.sdb deleted file mode 100644 index 4c32ce69..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000003.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000004.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000004.sdb deleted file mode 100644 index 9f82b6f9..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000004.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000005.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000005.sdb deleted file mode 100644 index 3147145f..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000005.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000006.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000006.sdb deleted file mode 100644 index 6e16076d..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000006.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000007.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000007.sdb deleted file mode 100644 index 28e0170d..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000007.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000008.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000008.sdb deleted file mode 100644 index d77d432d..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000008.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000009.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000009.sdb deleted file mode 100644 index b65dc65a..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000009.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000010.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000010.sdb deleted file mode 100644 index 5bf9df7e..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000010.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000011.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000011.sdb deleted file mode 100644 index 7e053382..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000011.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000012.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000012.sdb deleted file mode 100644 index e3ece243..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000012.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000013.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000013.sdb deleted file mode 100644 index 994b42e8..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000013.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000014.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000014.sdb deleted file mode 100644 index 29ede035..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000014.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000015.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000015.sdb deleted file mode 100644 index fee28bfe..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000015.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000016.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000016.sdb deleted file mode 100644 index 98016cfe..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000016.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000017.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000017.sdb deleted file mode 100644 index d91ee145..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000017.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000018.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000018.sdb deleted file mode 100644 index e0f8943f..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000018.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000019.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000019.sdb deleted file mode 100644 index 9a4a7e66..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000019.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000020.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000020.sdb deleted file mode 100644 index ee308d67..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000020.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000021.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000021.sdb deleted file mode 100644 index 7d02fadd..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000021.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000022.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000022.sdb deleted file mode 100644 index 00fa6733..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000022.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000023.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000023.sdb deleted file mode 100644 index 998a2c8c..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000023.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000024.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000024.sdb deleted file mode 100644 index d33904c5..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000024.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000025.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000025.sdb deleted file mode 100644 index d79f5375..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000025.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000026.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000026.sdb deleted file mode 100644 index 41de6b42..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000026.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000027.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000027.sdb deleted file mode 100644 index 068fc898..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000027.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000028.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000028.sdb deleted file mode 100644 index 049b662d..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000028.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000029.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000029.sdb deleted file mode 100644 index 3485be02..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000029.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000030.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000030.sdb deleted file mode 100644 index ef50350a..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000030.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/shards/1451520000000000031.sdb b/dbtest/dbpath1/benchmark/shards/1451520000000000031.sdb deleted file mode 100644 index bfc1658e..00000000 Binary files a/dbtest/dbpath1/benchmark/shards/1451520000000000031.sdb and /dev/null differ diff --git a/dbtest/dbpath1/benchmark/users.dat b/dbtest/dbpath1/benchmark/users.dat deleted file mode 100644 index 7f06059c..00000000 --- a/dbtest/dbpath1/benchmark/users.dat +++ /dev/null @@ -1 +0,0 @@ -üð„iris¿ZkjWsLgK$1/L2Uzs0bnkc01bpT/0KOlPC5hTe1d.xb6COEOdQ2Uc1aRFE9HpxZLéÿ \ No newline at end of file diff --git a/dbtest/siridb-http.conf b/dbtest/siridb-http.conf deleted file mode 100644 index a03dfbb9..00000000 --- a/dbtest/siridb-http.conf +++ /dev/null @@ -1,78 +0,0 @@ -# SiriDB HTTP Configuration file -[Database] -# User with at least 'show' privileges. -user = iris - -# A password is required. To protect the password this file should be placed in -# a folder where unauthorized users have no access. -password = siri - -# Database to connect to. -dbname = benchmark - -# Multiple servers are allowed and should be comma separated. When a port -# is not provided the default 9000 is used. IPv6 address are supported and -# should be wrapped in square brackets [] in case an alternative port is -# required. SiriDB HTTP will randomly select an available siridb server -# for each request. -# -# Valid examples: -# siridb01.local,siridb02.local,siridb03.local,siridb04.local -# 10.20.30.40 -# [::1]:5050,[::1]:5051 -# 2001:0db8:85a3:0000:0000:8a2e:0370:7334 -servers = localhost:9001 - -[Configuration] -# Listening to TCP port. -port = 5050 - -# When disabled no authentication is required. When enabled session -# authentication or basic authentication is required. -require_authentication = True - -# When enabled /socket.io/ will be enabled and Socket-IO can be used as an -# alternative to the standard http rest api. -enable_socket_io = True - -# When enabled the crt_file and key_file must be configured and the server -# will be hosted on https. -enable_ssl = False - -# When enabled a website is hosted on the configured port. When disabled the -# resource URIs like /query, /insert, /auth/.. etc. are still available. -enable_web = True - -# When enabled the /query and /insert resource URIs can be used with basic -# authentication. -enable_basic_auth = False - -# When multi user is disabled, only the user/password combination provided in -# this configuration file can be used. -enable_multi_user = False - -# Cookie max age is used to set the cookie expiration time in seconds. -cookie_max_age = 604800 - -# The query api allows you to specify a timeout for each query, but the insert -# api only accepts data. Therefore the insert timeout is set as a general -# value and is applicable to each insert. -insert_timeout = 60 - -[SSL] -# Self-signed certificates can be created with the following command: -# -# openssl req -x509 -nodes -days 365 -newkey rsa:2048 \ -# -keyout certificate.key -out certificate.crt -# -crt_file = certificate.crt -key_file = certificate.key - -# -# Welcome and thank you for using SiriDB! -# -# A configuration file is required and shoud be provided with the -# --config argument. -# Above you find an example template which can be used. -# - diff --git a/dbtest/siridb0.conf b/dbtest/siridb0.conf deleted file mode 100644 index ead07f2b..00000000 --- a/dbtest/siridb0.conf +++ /dev/null @@ -1,86 +0,0 @@ -# Welcome to the SiriDB configuration file - -[siridb] -# -# SiriDB will use this address:port for it's back-end connections. -# This must be an address that other servers can use to connect to. -# For example IPv4, IPv6 or a fqdn are all possible. When using IPv6 be sure -# to wrap the ip address with square brackets. For example [::1]:9010 -# The default value is %HOSTNAME:9010. The variable %HOSTNAME will be translate -# to the systems host name. -# -# -server_name = %HOSTNAME:9011 - -# -# Listen for SiriDB-server connections only on localhost. -# Use value 0.0.0.0 (or :: for IPv6) to bind to all interfaces. -# -bind_server_address = 0.0.0.0 - -# -# SiriDB will listen for client connections on this port number. -# -listen_client_port = 9001 - -# -# Listen for client connections only on localhost. -# Use value 0.0.0.0 (or :: for IPv6) to bind to all interfaces. -# -bind_client_address = 0.0.0.0 - -# -# When ip_support is set to ALL, SiriDB will listen and connect to both IPv4 -# and IPv6 addresses. -# Valid options are ALL, IPV4ONLY and IPV6ONLY. -# -ip_support = ALL - -# -# SiriDB will load databases from, and create databases in this location. -# -default_db_path = ./dbpath0 - -# -# SiriDB will run an optimize task each X seconds. A value of 0 (zero) disables -# optimizing. -# -optimize_interval = 3600 - -# -# SiriDB uses a heart-beat interval to keep connections with other servers -# online. -# -heartbeat_interval = 30 - -# -# SiriDB can run fsync on the buffer file on an interval in milliseconds. -# This value is set to 0 by default which tells SiriDB to run fsync after -# each insert request. When having many insert requests per second, it can be -# useful to use an interval like 500 milliseconds. -# -#buffer_sync_interval = 500 -buffer_sync_interval = 500 - -# -# SiriDB will not open more shard files than max_open_files. Note that the -# total number of open files can be sligtly higher since SiriDB also needs -# a few other files to write to. -# -max_open_files = 32768 - -# -# Use shard compression for storing data points. -# Set value 0 to disable shard compression. -# -enable_shard_compression = 1 - -# -# Enable named pipe support for client connections. -# -enable_pipe_support = 0 - -# -# SiriDB will bind the client named pipe in this location. -# -pipe_client_name = siridb_client.sock diff --git a/dbtest/siridb1.conf b/dbtest/siridb1.conf deleted file mode 100644 index 83bd178e..00000000 --- a/dbtest/siridb1.conf +++ /dev/null @@ -1,85 +0,0 @@ -# Welcome to the SiriDB configuration file - -[siridb] -# -# SiriDB will use this address:port for it's back-end connections. -# This must be an address that other servers can use to connect to. -# For example IPv4, IPv6 or a fqdn are all possible. When using IPv6 be sure -# to wrap the ip address with square brackets. For example [::1]:9010 -# The default value is %HOSTNAME:9010. The variable %HOSTNAME will be translate -# to the systems host name. -# -server_name = %HOSTNAME:9011 - -# -# Listen for SiriDB-server connections only on localhost. -# Use value 0.0.0.0 (or :: for IPv6) to bind to all interfaces. -# -bind_server_address = 0.0.0.0 - -# -# SiriDB will listen for client connections on this port number. -# -listen_client_port = 9001 - -# -# Listen for client connections only on localhost. -# Use value 0.0.0.0 (or :: for IPv6) to bind to all interfaces. -# -bind_client_address = 0.0.0.0 - -# -# When ip_support is set to ALL, SiriDB will listen and connect to both IPv4 -# and IPv6 addresses. -# Valid options are ALL, IPV4ONLY and IPV6ONLY. -# -ip_support = ALL - -# -# SiriDB will load databases from, and create databases in this location. -# -default_db_path = ./dbpath1 - -# -# SiriDB will run an optimize task each X seconds. A value of 0 (zero) disables -# optimizing. -# -optimize_interval = 3600 - -# -# SiriDB uses a heart-beat interval to keep connections with other servers -# online. -# -heartbeat_interval = 30 - -# -# SiriDB can run fsync on the buffer file on an interval in milliseconds. -# This value is set to 0 by default which tells SiriDB to run fsync after -# each insert request. When having many insert requests per second, it can be -# useful to use an interval like 500 milliseconds. -# -#buffer_sync_interval = 500 -buffer_sync_interval = 500 - -# -# SiriDB will not open more shard files than max_open_files. Note that the -# total number of open files can be sligtly higher since SiriDB also needs -# a few other files to write to. -# -max_open_files = 32768 - -# -# Use shard compression for storing data points. -# Set value 0 to disable shard compression. -# -enable_shard_compression = 1 - -# -# Enable named pipe support for client connections. -# -enable_pipe_support = 0 - -# -# SiriDB will bind the client named pipe in this location. -# -pipe_client_name = siridb_client.sock